Android 8.1.0 release 11
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWnDmcgAKCRDorT+BmrEO
eLhhAJ9g1u4+P/LWaxtr7yIX6+FKnYt1qQCgi5l/S4yRMuV67eo9JVGAtDPpIOI=
=2y7l
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58