Fixup cm reorg, and temporarily switch to cm-11.0's kernel

Change-Id: Ia569e5fc506254d2e759150165a4a38c812bcf52