Android 7.0.0 release 21
merge in nyc-release history after reset to nyc-dev