Backport 734d57d5f7842aa7c2c9f36d62131ab4d8bd6c87 from libopenjpeg20 am: 3e2c4b9394 am: 68ef92134c am: fdc91d98d6 am: a3c495c1ca am: f2f4cb09b7
am: 03bf2131b0

Change-Id: Ia27864bc95794c01f5f2c5c4023734707579cafc