Android 8.1.0 Release 40 (OPM4.171019.021.R1)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWyluSgAKCRDorT+BmrEO
eIH8AJ4iP1RmG9Xkq64x6gqwY/ctIUggZwCcDrn0XLXReK7og1dR+Z+GlAOGfkk=
=6nU2
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58