Android 8.1.0 Release 6 (OPM1.171019.015)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWkwwMQAKCRDorT+BmrEO
eIHUAJ9OonvCblezZcwEajalFQY4iydUqQCfaqV1OU0Z/8MLt2Uku7iG7V6XOgc=
=plJQ
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58