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

Change-Id: Ia569e5fc506254d2e759150165a4a38c812bcf52
jf: not to be judged by its unified tree name

Change-Id: Id910eff266481cbc4f76e851a83ea4cf15f2ef6a