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