am 68c02e25: Merge "Preliminary support for clipRect(Rect, Op)"

* commit '68c02e25e84e9814d313b43680631b98e25fa6d5':
  Preliminary support for clipRect(Rect, Op)