Merge "Handle lock() returning a NULL buffer in SurfaceUtils." into nyc-dev am: d498419257
am: 8244c11758

* commit '8244c117585741a298848523e5c7b9ef2a128659':
  Handle lock() returning a NULL buffer in SurfaceUtils.

Change-Id: I3cad6b3c24c618675f65f29a33ae9f32194612ad