Android 7.0.0 release 21
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAlgqLooACgkQ6K0/gZqxDnhZnQCfTGu9+5iejeZnteSzQliqo+a/
d8EAn2TFdyCuNqd607I7eCoOavsOfBwu
=/RqF
-----END PGP SIGNATURE-----
merge in nyc-release history after reset to master