Android 7.0.0 Release 13 (NBD90X)
merge in nyc-release history after reset to nyc-dev