Merge "Benchmark: Remove stl and sdk_version from Android.bp"

media/tests/benchmark/MediaBenchmarkTest/src/main/cpp/Android.bp

@@ -17,8 +17,6 @@ cc_test_library {
         "liblog",
     ],
 
-    sdk_version: "current",
-
     static_libs: [
         "libmediabenchmark_common",
         "libmediabenchmark_extractor",
@@ -27,8 +25,6 @@ cc_test_library {
         "libmediabenchmark_encoder",
     ],
 
-    stl: "c++_static",
-
     cflags: [
         "-Wall",
         "-Werror",

media/tests/benchmark/src/native/common/Android.bp

@@ -52,10 +52,6 @@ cc_defaults {
         "liblog",
     ],
 
-    stl: "libc++_static",
-
-    sdk_version: "current",
-
     cflags: [
         "-Wall",
         "-Werror",