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

Change-Id: I31f31ec2b466fe73d03a60cf6276115980067ea7