Merge "releasetools: Clean up two no-op lines that set 'ota-wipe'."