track master of a few more aosp repos