Android 8.1.0 release 33
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWxV2yQAKCRDorT+BmrEO
eOJHAJ41YTzpMtnnpYjKOYWl9kyfDT6ZqQCfVFzkpR0B+CvoFS/a8fN3enTLX1A=
=tA8w
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58