Android VTS 8.1 Release 6 (5035638)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCW7++2AAKCRDorT+BmrEO
eH2pAKCQvgNirYtkT1/M7tbwMz01f9GF9wCeM49L9tW01R2aoCOOcgzLLn5XQw4=
=WtSS
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58