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

Change-Id: I7bc53736e1d455caf3d0b10f6374ebbcf7bd5254