Merge "Add SurfaceHolder#lockHardwareCanvas()"