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

Change-Id: Ia98bcd694a78a7a9bfbc863b98ac4916b1dd48ba