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

Change-Id: Idd0ac53795d14e75b9770e97f2dac76b6c9fa3f0