Merge "Remove String16 operator<<, now provided in header"