Android o preview 4
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAlmI+rYACgkQ6K0/gZqxDnhiiwCePglbvqbkFkRsw92oxfFIxYR+
EeAAnA400tNgCosm0nCTCFki6Pd+gV8W
=7ZYk
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific""
am: 15314896f3

Change-Id: Ib24338583e6cfd282ee7d57cab07e55adabbad16