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

Change-Id: I5df1108c87706ea89ed9d3345abfb78905f138cd