Android 7.0.0 Release 12 (NBD90W)
merge in nyc-release history after reset to nyc-dev