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

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

Change-Id: Ie7c00fb4684c299ae39bccdf992aa636c5b4b0a6