Make room for the string routines. am: 543898646f am: 0901342c69

Change-Id: I86441dd8bb4d5ddf3a2316d326e3142fa17932af