Android VTS 9.0 Release 8 (5409071)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXLUAnAAKCRDorT+BmrEO
eERJAJ9Pqe4svfU2mVoe2tXxTUSO1NkF/wCeLgI0U6Z+XJLpj8IePZKP2+my1FM=
=+PSl
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58