am a42ceb03: Merge "Disallow negative scale matrices in merged Bitmap drawing" into klp-dev

* commit 'a42ceb03cf6a1cbcd9f526afb02d806b2c200ee3':
  Disallow negative scale matrices in merged Bitmap drawing