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

Change-Id: I693c55e1928459667e8c16fd57d40a609c70258e