Merge "releasetools: Move recovery-two-step.img to OTA/."