Merge "Bundled pjproject: Fix finding SIP transactions."