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

Change-Id: I78ee55d293b05402fc6ac7b5297a23ae16ff8081