Fix up mountable and formatable partitions in recovery

Change-Id: I890247064f38c62a74ecfe84a48dacc065dfb194
Merge branch "cm-11.0" into kylin