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

Change-Id: Ib0f78505b33ac05a0a5728ab90140af29ca3fe3a