Android VTS 8.1 Release 7 (5335206)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXIfyHQAKCRDorT+BmrEO
eO+BAJ9UzAgSmG5aJVFzgsPm/U0nj2S1bgCfWCSs0bpGhcQtvMmc9n2Abkrmm5w=
=hHuJ
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58