Android 8.1.0 Release 15 (OPM1.171019.021)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWp2b7gAKCRDorT+BmrEO
eBfsAJ98S8leTLSlnDTlk07PWRxhxO5kMwCeO9ndsF4e55cDti/O26tFxdTRhs8=
=WBAH
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58