Merge "Build recovery-two-step.img for two-step OTAs."