Android 8.1.0 release 31
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWxV17gAKCRDorT+BmrEO
eBqOAKCFoFP3+e3NdahjtQqRvsFch1q8NQCfceRpZWFtlwsIbboH9Pp96n6mI90=
=CFYh
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58