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

Change-Id: Icb9f044bed7d309a7f7f37f469d3f9fa9c16cabd