Merge "Benchmark: Remove stl and sdk_version from Android.bp" am: ef4228f9c3 am: 2ff13bf018

Change-Id: I6478be0e71a8cc32e02f6f654bac7ba189a27165