Android 8.0.0 release 22
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAlnuErMACgkQ6K0/gZqxDnhxjgCcDNbf8BqmrgTTixa/N65gdVIL
kxoAnRszBIsS5AEI3wYvbjj9RqEZKh3r
=EwV7
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58