Separate and Include AOSP manifest