Merge "Fix test/Android.bp on ARC builds"