Android 7.0.0 release 17
merge in nyc-release history after reset to master