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

Change-Id: I85c6f7b8494d70c30ccdc222760e45964230c347