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

Change-Id: I60d7098c403ddd44f3ed665c29bfe0bf0663aef5