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

Change-Id: Iabb167790602c6b2aa1d04559c7689ad15bfce76