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

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

Change-Id: I810a351087cc820bb0279183740dd1bdcd1a7bec