Android 8.1.0 Release 2 (OPM2.171019.012)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWjRSrAAKCRDorT+BmrEO
eNbyAJ0fwkvh24Ey5NzEJ1koK2KXVxLoEwCcCgoVPe32iiNDB1Qe1m9UmZQ+IPo=
=OypP
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58