Backport 734d57d5f7842aa7c2c9f36d62131ab4d8bd6c87 from libopenjpeg20 am: 3e2c4b9394 am: 68ef92134c
am: fdc91d98d6

Change-Id: Id7b2e53de5cfd9fdfc834f8e8e0bc4eca1a7ac14