Merge "Revert "Handle lock() returning a NULL buffer in SurfaceUtils."" into nyc-mr1-dev
am: 9c6c7f370f

Change-Id: Ib3bf787a09c85e30db52ab3fda4ced0ad1be432e