Android N MR2 Preview 2
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAljj2Q8ACgkQ6K0/gZqxDnim4wCfeh+vWtRsnwKvOSKixox+Uauk
XD0An2v0W8iKu92DuxtyoFmc5BerD9HI
=TNMP
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific""