Backport 734d57d5f7842aa7c2c9f36d62131ab4d8bd6c87 from libopenjpeg20
am: 3e2c4b9394

Change-Id: I169d0b4954ac6b235f03fd552809b924265e8190