Fix up mountable and formatable partitions in recovery

Change-Id: I8f52b0e59989bd87f5f17bb30d44e9aa30f52102