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

iEYEABECAAYFAloB+Y4ACgkQ6K0/gZqxDng+6QCdH/5u5UA4JGqf4DqwpXvE1tu8
C+YAoIPa36yiikxRU4qQJ2ziSxWR9VZq
=AoKR
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58