Android O IOT Preview 8 (4718959)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWtTZXwAKCRDorT+BmrEO
eG31AKCMDOfXE7kcVKhDMr8EAIVP67PqyACgkea8UWLQyVlhw4ViUZWg9vDtuOY=
=9lE/
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58