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

Change-Id: Iec7e188602018a2228fa60b4a18cb12ccb6c4e39