Merge "Remove global ScopedBytes.h and toStringArray.h" am: 9af782e03d am: ead77a3067 am: 9ce6beb592 am: 0ce0509960
am: ec314e378f

Change-Id: I7a4ed4707a6b49f36adfca17e4e54ca7c483831c