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

* commit '98695713bdab3254ce0241eb10d3623d5495f80f':
  Handle lock() returning a NULL buffer in SurfaceUtils.

Change-Id: Iab4f77eda0489a7a37d2b929229f659afbb14e34