Merge \"Revert \"Handle lock() returning a NULL buffer in SurfaceUtils.\"\" into nyc-dev
am: 6aa63c2905

Change-Id: I9af94f2f7b3c6ac14530331c73b478f3da9585f2