Merge "Work-around paletted image decoding bug in SDK_JELLYBEAN" into nyc-dev