Merge "Add stride support to JPEG/R java API" into main