Android CTS 8.1 Release 13 (5240576)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXGRnDAAKCRDorT+BmrEO
ePZmAKCGZb7Ktho35H+kpEf28XfvZK/s4gCfY7qs88PnOF8JJT8WhjcFEgI88q4=
=j+4d
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58