Android 8.1.0 Release 16 (OPM1.171019.022.A1)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWp2hJAAKCRDorT+BmrEO
eJFDAJ9R0eGIzYkeR4QuQZfp2hp15fC62wCeOyNfYRwD+8bctXtPUnI3t67H8zA=
=zQSa
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58