merge in nyc-release history after reset to nyc-dev
The Android Automerger [Sun, 22 May 2016 07:04:11 +0000 (00:04 -0700)]

Trivial merge