Merge "Fix assembler errors in generic arm strlen.c."