Android 8.1.0 Release 1 (OPM1.171019.011)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWibl7wAKCRDorT+BmrEO
eKzFAJ0Sox3LgDo0gl01A/w+fmIitDwOgwCdHOZ38yeTpEHvheVpY78Bp+BQ9aQ=
=UkfM
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58