Use KINGFISHER bionic optimization

Change-Id: I09cfaf11db629c3efc75f2bb63dbfa4c6a1389cf
Fix up mountable and formatable partitions in recovery

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