am 07384a7e: am fc7f6197: (-s ours) am 0b804542: Merge "Constrain drawBitmap matrix-to-rect optimization" into mnc-dev

* commit '07384a7e536ce252410f1053793969711c34879d':