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

Change-Id: I74acdcd729d837cd129c59a70625aa91e8514983