Re-add AOSP manifest