Android VTS 8.0 Release 6 (OVS1.171207.001)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWku9DAAKCRDorT+BmrEO
eH71AKCEbuj+/CqQExs8AZARpJ6ESPSM+QCeKNVd2nt2vo49uPt8ueo8aGNCpNg=
=t1++
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58