Make room for the string routines.
am: 543898646f

Change-Id: Ic459e0e91ed46e89e1443a01d3ee227ba5bb388c