Merge "Upgrade arm-optimized-routines to 0f4ae0c5b561de25acb10130fd5e473ec038f89d"