Android O MR1 Preview 2 (OPP6.171019.012)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWiiQewAKCRDorT+BmrEO
eDs9AJ9djh0CRAG9amaPn71NDqMZMFLg9QCeO4mH/eWcgawF6AgsJGvnuiCSoik=
=TLS8
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58