[automerger skipped] Merge "Remove String8(StaticLinkage) references." into rvc-dev am: 6e83f698b0 am: 28b72053a9 -s ours am: 90254880ff -s ours
am skip reason: Change-Id I009b2ca53631509072b4085f3f53c0b94e71b13e with SHA-1 0c217577e3 is in history

Change-Id: I1123ccb30d3b62fda594823cb2a8651a635b5ecd