Merge "Upgrade arm-optimized-routines to 9c8399909a9835e6f55977df1661cf6306c56707"