Merge "Make arm-optimized-routines-tests works with testmapping" am: 36a7ad0da0 am: 64fa5e391e

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

Change-Id: I0f7cfbc072496e6261b811f53ae8e89390eed164