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

Change-Id: I260c8c0892588d6e573814c656fb3787536330de