Merge "Upgrade arm-optimized-routines to 9c839990" am: 6a751e14 am: 745c6da1 am: 56ece294 Change-Id: Ib0f733ddeee6520bc952335e3452b69bf3c03d30