Android VTS 9.0 Release 4 (5007851)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCW61eWAAKCRDorT+BmrEO
eLgYAJ9prCcB8+sHbwProQHkKANRUIrvIwCggKgZq/11sODr3SOn271Xinl7mX4=
=TcVf
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58