Android 8.1.0 Release 25 (OPM2.171019.029.A1)
-----BEGIN PGP SIGNATURE-----

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

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58