Android VTS 9.0 Release 7 (5338953)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXIf9KwAKCRDorT+BmrEO
eDbtAJ9ZoHBoMBDB3QSDBlgYFQysitDc4ACdE41MQFK+d47BzJuEDEtmMfXJ8GU=
=+nRy
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58