Merge "Revert "Move android.hardware.benchmarks into android.hardware.tests""