Merge "Backport 940100c28ae28931722290794889cf84a92c5f6f from libopenjpeg20" into lmp-dev am: 57d92ccd81
am: 546760ac17

Change-Id: I9f5552424118675d263792501cd16cd85efbbabd