Merge "Upgrade arm-optimized-routines to e112794669739057178f5ae8c94ccf0f8ca59c60"