Android VTS 8.0 Release 1 (4256865)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWdVx8QAKCRDorT+BmrEO
eKl1AJ98oG/iY5tzBRXLcC8gh7Hf9Hm7AgCgjV/F8rVCIn0L/BCEAWPlZNrVnAQ=
=G7iq
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58