[automerger skipped] RESTRICT AUTOMERGE: Fix bug decoding JCS_RGB jpeg files
am: 41220b678b  -s ours

Change-Id: I0f4d4a78eec283480207cbe55ab4ded4890d1cc6