Android VTS 8.0 Release 9 (4990514)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCW9Cs/AAKCRDorT+BmrEO
eMXSAJ49aaSb2CQWXts1RA94SK9E37yXEQCeKi3scJ4k1HpJlBgHgZdbvuXzOBY=
=7ijz
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58