Merge "Track upstream arm-optimized-routines changes."