Merge "Use StringBssEntry for testing PC-relative patching."