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

Change-Id: I690b303e8eb6de47a78e1938b7fdcbafea9b5fb4