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

Change-Id: I7ec22003c490258a4e6d713174310e45d9576f9a