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