Merge "releasetools: Specify SWITCH_SLOT_ON_REBOOT for secondary payload."
am: 4f0b725439

Change-Id: Ic027da8aaab2f3d3034255a6726fd3a55063f647