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

Change-Id: I540bffda6544f2cfeba71d2d19ab4f2c959bafa4