Merge "releasetools: Move recovery-two-step.img to OTA/." am: 98efd8290e am: ac280723c2 am: 86c58acb90
am: aedddc920a

Change-Id: I2a8e5013948322c0eb19e5d076a5352965577df8