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

* commit '7da9d7fae673473a3a24d3ff0127bd0c67f70337':
  Constrain drawBitmap matrix-to-rect optimization