am 0b804542: Merge "Constrain drawBitmap matrix-to-rect optimization" into mnc-dev

* commit '0b8045425ff58f992046ff2be35bc91001dabf7b':
  Constrain drawBitmap matrix-to-rect optimization