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

Change-Id: Iebe5c0d1ccb3d0185ae5b686ec826f65b83494b2