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

Change-Id: I3b1a764c1e0c818685cbf09b4e88bafc459c63ac