Android N IOT Preview 4 (NIH40E)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAlkc8OMACgkQ6K0/gZqxDngB3QCfXKogbcOY+VZo44Pl7nId4Ijf
lIYAoIGeggAgT5BvndmMP/yTd9aCWOdl
=sPdt
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific""
am: 15314896f3

Change-Id: Ib24338583e6cfd282ee7d57cab07e55adabbad16