Merge "Upgrade arm-optimized-routines to 1fd2aaae0fcb13f3a53be8de50b68d269145a0a4"
am: accf6eb5b6

Change-Id: If98ea461b110ef0bd87e79091241fdb49d8d516e