Merge \"Handle lock() returning a NULL buffer in SurfaceUtils.\" into nyc-mr1-dev
am: 3e5605b8b8

Change-Id: Ib3fd6838993a582839cbf58437fa115797732f32