art: use AOSP master-ish