Android CTS 8.1 Release 6 (4799944)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWyBA5AAKCRDorT+BmrEO
eNdWAJ4xcrbrM8mv/GANWtXF+F9jyaopPACfZLFf/D0cBkflzh4y0oCKjtOWClU=
=J2LI
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58