Merge "SurfaceFlinger: fix releaseBuffer in updateTexImage"