Merge "Remove String16 operator<<, now provided in header" am: 49220d1ad4 am: 9fc06b82b3

Change-Id: Ie1d23c5aad467f659c73d119af26f3b5e8cfde9c