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

Change-Id: Ib12a8db7150fdcdc1e161bea155663ccd7495d14