Merge "bundled pjproject: Crashes while resolving DNS names."