Merge AOSP manifest