Switch back to cm's kernel and fix an sepolicy derp

Change-Id: I957b27790a2e8635073798158d83c85e7ddf0bc3