[automerger skipped] Merge "RESTRICT AUTOMERGE: Fix bug decoding JCS_RGB jpeg files" into oc-dev am: d9b0ae829d
am: ce7eab87b9  -s ours

Change-Id: I4f1435d3214841be894586cc628b196f7e17c090