Android 8.1.0 Release 41 (OPM6.171019.030.E1)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWylxswAKCRDorT+BmrEO
eA7DAJ0Z9DZo77Ak9GqNK0GMQ16+NgJZDgCeMztXOGgLkqS6rOCwda9JuasIpBg=
=fm90
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58