[automerger skipped] Merge "Remove String8(StaticLinkage) references." into rvc-dev am: 6e83f698 am: 28b72053 -s ours
am skip reason: Change-Id I009b2ca53631509072b4085f3f53c0b94e71b13e with SHA-1 0c217577 is in history
Change-Id: I92e6cad5026caeb42a1bd1ff9e9c6d090b066e9d