Android VTS 8.0 Release 2 (4339158)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWfD7IQAKCRDorT+BmrEO
eEHJAJ9Ewg73/ydFlfum9lp2nX0CeH1x7QCgkiCogbgk+ewYpPMBbD2n3WFfgTY=
=DpP1
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58