Android CTS 8.1 Release 12 (5131724)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXBAKbQAKCRDorT+BmrEO
eDaKAJoCMQ62MOcIRrNcu+z+YmYIJPayBwCcCbzUWhyRLzXN2UuC3yALz24xeoI=
=l2Z1
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58