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

iEYEABECAAYFAloAquMACgkQ6K0/gZqxDnhCdgCcCXB50ktN7XSHj4nkk9KyupsP
PFQAn0Y1A8aV34gj7qNGboDJlYBplbkp
=GSxt
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58