Android O IOT Preview 5 (OIR1.170720.015)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAlmTZyQACgkQ6K0/gZqxDnj5bwCeJxR+CWTEXtzFvwYkf2cNePXt
e3IAnRHemZkIEO69P5kdEeEVflNBo/ki
=0SUA
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific""
am: 15314896f3

Change-Id: Ib24338583e6cfd282ee7d57cab07e55adabbad16