Merge "Remove String16 header cruft." am: 770a0f078d

Change-Id: If923aa149715904935dd0902a767788422f5c81b