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

Change-Id: I6f5a9999990547c83c4485ff2db4ba51f9802654