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

Change-Id: I1412199bea72a27e904af5fae719487e2b254c72