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

Change-Id: Ia7e9581c10f14b3b50984afe371925536e47372d