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

Change-Id: I0fc9822d7e1536b5a55c98ba7d92d952b3c4b278