[automerger skipped] Merge "Fix .equals call in ImageDecoder" into rvc-dev am:...
[automerger skipped] Merge "Fix .equals call in ImageDecoder" into rvc-dev am: 33696c1c am: cd6d5575 am: 82d49cc8 am: 3471e8f6 -s ours
am skip reason: Change-Id I0df5d2407a32fad0e21e597697af293fbc2fb315 with SHA-1 6419ebff is in history
Change-Id: Ie061b80be82834615c941ce127a3c91e670f83a1