Use some more recent AOSP repos