Android 8.1.0 release 13
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWnDk3AAKCRDorT+BmrEO
eD22AJ9Gm0A6RRpQbZYIsHAw/8Pp5GIVygCfUVhnEGQkubEZ6q3SIksN3knp8eE=
=wa6m
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58