Android CTS 8.1 Release 7 (4855739)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCW050SAAKCRDorT+BmrEO
eMVtAJ9iH8b7A/YOd/UNg4VQY+3tH5t+HgCfZyx/npc/+6rKI2NwZN5p/XQRK70=
=gNt8
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58