Android 8.1.0 Release 60 (OPM8.190105.002)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXDOgUAAKCRDorT+BmrEO
eGiYAJ4p+fSOvpqBgZKPp3GmFoFU7OO4CwCfdbCRnfqHE4zxIQ3OEwT+bWsBQyI=
=Sujj
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58