resolved conflicts for merge of 18d7a4e3 to master

diff --cc testrunner/test_defs.xml
index 8982202,43bbfdd..f1346e3
--- 1/testrunner/test_defs.xml
--- 2/testrunner/test_defs.xml
+++ b/testrunner/test_defs.xml
@@@ -494,10 -485,12 +496,16 @@@ Native tests
      description="Bionic libstdc++."
      extra_make_args="BIONIC_TESTS=1" />
  
 +<test-native name="libskia"
 +    build_path="external/skia/tests"
 +    description="Skia tests." />
 +
+ <!--  Android STL tests -->
+ <test-native name="astl"
+     build_path="external/astl/tests"
+     description="Android STL."
+     extra_make_args="ASTL_TESTS=1" />
+ 
  <!-- pending patch 820
  <test-native name="gtest"
      build_path="external/gtest"