Merge "Upgrade arm-optimized-routines to 1fd2aaae0fcb13f3a53be8de50b68d269145a0a4"