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

Change-Id: Ib5b34289cb41f6e682a383ab080fba13233da130