Fix up mountable and formatable partitions in recovery

Change-Id: I0c299ad7bf6044c5728d61b8d4c9892550fcf342
Merge branch 'cm-11.0' into martincz