Merge "Decouple SurfaceTexture from HWUI"