Merge "Prevent manifest file from being added to prebuilts" into pi-dev
am: 062f9cb27e

Change-Id: I7dbf612744b2491ae0b00150fb12efe7a70ef2c0