Merge "Use StringBssEntry for testing PC-relative patching." am: 015a070503
am: 8f7ccffbe7

Change-Id: I9f1456b86061e5a35752a141e76a3b4480f89afd