am 0c01222f: Merge "Don\'t crash when scaling Bitmaps with private Bitmap.Configs" into jb-dev

* commit '0c01222ff6507c6e3eaeec7070a510201165d6f3':
  Don't crash when scaling Bitmaps with private Bitmap.Configs