Merge "Remove String16 header cruft." am: 770a0f078d Change-Id: If923aa149715904935dd0902a767788422f5c81b Cr-Mirrored-From: https://chromium.googlesource.com/aosp/platform/system/core Cr-Mirrored-Commit: 25168b017da178b9053f0b4b0aa071fe3dd667c3