Merge "releasetools: Support packaging secondary payload."
am: 67ba60029d

Change-Id: Ibfaae3cea310afbe2de85f04386880bcee127027