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