am 9c45aa8f: am ca3c865d: am 892768fb: am 0b804542: Merge "Constrain drawBitmap matrix-to-rect optimization" into mnc-dev

* commit '9c45aa8f0db8e3c5370172018e162b7ecaf9ea4a':
  Constrain drawBitmap matrix-to-rect optimization