am f56945e0: Merge "Improve GLES20Canvas clip support"

* commit 'f56945e06aed28041f0f370c26b4b8986033c489':
  Improve GLES20Canvas clip support