Merge "Prevent manifest file from being added to prebuilts" into pi-dev