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

Change-Id: I5f8f37f9930041faf1750d3c3dff0ab24b1a5044