Merge "Prevent manifest file from being added to prebuilts"
am: 9f920e6bdf

Change-Id: I6277dfa4a7534558270bf5f5df17c5683717ca4a