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

Change-Id: Id3f29aa5061e28161ba7ca9e1f23f89e064d229d