Android 8.1.0 Release 4 (OPM1.171019.013)
-----BEGIN PGP SIGNATURE-----

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

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58