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

Change-Id: I1694e4bf70d0886322be38d2757c2af62d9d6dcb