Android 8.1.0 release 22
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWsJ+wQAKCRDorT+BmrEO
eEGsAKCS/txZj7bWGpaNzcUEQOnXxFEFPQCdHRzM+pE618jg61U+PwcOno1o+MU=
=aVCV
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58