Android O IOT Preview 6 (4475743)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWi7K3wAKCRDorT+BmrEO
eNbeAJ9pegjBY2a4M+75wCBWz5m4eqviEQCbBiwY3aCrYXB1z5UzfP8g35gfMsU=
=GnMf
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58