Merge "Fix test/Android.bp on ARC builds" am: 8b4da2ffa8 am: 8ab7f17d3c

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1467064

Change-Id: I184558ce8a0ff20fda750a60487946148d77e9a7