Merge "Fix recovery image build."