Merge "Canvas.getClipBounds() was broken and unreliable with OpenGL ES 2.0"