Merge "Revert "Move android.hardware.benchmarks into android.hardware.tests"" am: b59f873ab9
am: 19de6f7815

Change-Id: I1cc467152a0308b877a261a89480eef6e09e38cf