Merge "Fix a mismatch in Bitmap_createFromParcel" into sc-dev