Android 8.1.0 Release 37 (OPM4.171019.021.N1)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWylUhwAKCRDorT+BmrEO
eM63AJ47SxoNMqfWljjXzpCf5caTWIB3/wCfQYOqhdwJK0M2Sgi+ItKDV5qzzg0=
=auWG
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58