Android CTS 8.1 Release 4 (4666912)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWsz3kAAKCRDorT+BmrEO
ePTMAJ9p5AavHpSV1KcZ2ut6EJ9Yj/0JDgCdGrsYDqI/jD2Oo4kgjhO50mqHks0=
=dG13
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58