Android 8.1.0 release 42
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCW2SFrAAKCRDorT+BmrEO
eGOcAJ94cFvT8/MG4ALwPVStQSaQv4aSpgCfUKHY6e4mS7ez8BUb5yo0QVyBscY=
=+RMX
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58