Android CTS 8.1 Release 8 (4902914)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCW3MZ1wAKCRDorT+BmrEO
eCxUAKCLS1f4NzGgDzMZu4+d6oE/4gYyTACePXYzk22J8QbnF+Y3fAAyV91n248=
=FrPZ
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58