Merge "Upgrade arm-optimized-routines to 0f4ae0c5b561de25acb10130fd5e473ec038f89d" am: 614c18275d

Original change: https://android-review.googlesource.com/c/platform/external/arm-optimized-routines/+/1479384

Change-Id: Ib6dfb6c8948cbaa17829bb6f5f195098f57bc18c