Merge "Move android.hardware.benchmarks into android.hardware.tests"
am: 533ab025d0

Change-Id: If5750f2e0319f2abbf74a6629a3f2090cb36daab