Revert "Handle lock() returning a NULL buffer in SurfaceUtils." am: a092e55819
am: 4001a56758

Change-Id: I5a755c5aadec314bf68490c14780a2b1a9973662