Merge "Handle lock() returning a NULL buffer in SurfaceUtils." into nyc-dev am: d498419257 am: 98695713bd
am: 60e7c59430

* commit '60e7c59430e7acb98bcc4f9e3bc4b87687660853':
  Handle lock() returning a NULL buffer in SurfaceUtils.

Change-Id: I9bf13abfc1b3848965c4e68a985bd4172eb36a93