Android 8.1.0 Release 3 (OPM1.171019.012)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWkwcKAAKCRDorT+BmrEO
eDPjAJ9w958ZjCYqlU2ba0KB6b+2TlD0jACfb/CQEcs81lKiSitAxGo+W7S9T+I=
=MvHL
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58