Merge "Upgrade arm-optimized-routines to 9c8399909a9835e6f55977df1661cf6306c56707" am: 6a751e14fc am: 745c6da101
am: 56ece2945f

Change-Id: Ib0f733ddeee6520bc952335e3452b69bf3c03d30