Merge "Prevent manifest file from being added to prebuilts"