Merge "Remove String16 header cruft."