Merge "Handle lock() returning a NULL buffer in SurfaceUtils." into nyc-dev