Merge to XFA: Upgrade openjpeg to revision 2997.