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

Change-Id: I76f0d29fbc595b08cfcb3d3272b73e0890d14348