am 60d7c9fc: am 6db29a92: am f828f43f: am 38cf068c: am 16ac8ad7: am 4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE

* commit '60d7c9fcbcb80c556689f03c7b00984f94f9912b':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE