Merge "Remove String8(StaticLinkage) references." into rvc-dev am: 6e83f698b0 am: 28b72053a9

Change-Id: Ic885416879a6ef110a8faca4b044b916d8670913