Merge "Upgrade arm-optimized-routines to e112794669739057178f5ae8c94ccf0f8ca59c60" am: 6714750faa

Change-Id: I6a2fed2e4a538c7a03285d5237a3b6408550a7c9