Android VTS 9.0 Release 6 (5264840)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXGRvCAAKCRDorT+BmrEO
eKsGAJ0YPFWsw8hom32mOgsMczI6hbDTbQCfQDRTaLisyHGcrAz2yaz9yGTx2V0=
=K+1z
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58