Remove String16 dependency.

Bug: 31297066
Change-Id: Id3197ad73e6fe8e9550e6db80642c3af4a254282
5 files changed