Android 8.1.0 release 20
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWsJ97AAKCRDorT+BmrEO
eK4uAJ43QrUFwlQ1iqiMfd7rhDRkSfKj8wCeI/u2rQ7cQFJ06bfG1bzrwWmvEZs=
=n8de
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58