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

iEYEABECAAYFAlnuEkAACgkQ6K0/gZqxDnhCMgCfQRPogLFCl6S0BFjRFfkdXfUg
M1AAoI2qQPo4FRRPww4MgEWukDF5iqGz
=K2Vz
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58