Merge "Switch to the arm-optimized-routines string routines on aarch64 where possible." am: ddedd9828b

Change-Id: I262dff78db57ccff995bc7fe8ca3d12206afb246