Android VTS 8.1 Release 3 (4632653)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWqM3eAAKCRDorT+BmrEO
eEqNAJ9YjvQu6ssByI3HR5mUFbvjaAOnkwCfbGe7BW+s8ewxK/NAonuVVEgvQlU=
=w2HP
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58