Android 8.1.0 release 21
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWsJ+XAAKCRDorT+BmrEO
eEw8AJ9WJSUhd+caCrfs5MfPx00Iq7qCAwCgjpsKOJzC3JM/rNgriV6ptKlY2kY=
=2lp3
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58