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