Merge "Revert "Revert "Move android.hardware.benchmarks into android.hardware.tests""" am: 38f2a8495f
am: ca72971fea

Change-Id: I539fd6adbae57a17c33b7503ca34f8d2e67178b5