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

Change-Id: I6c116db7ec0d15e09129e60728fb26a86d897649