Revert "Bring in CM's unified CAF kernel for Nexus Devices"

This reverts commit 09f0b549ea93adc591e386d0cc3f386e357171fd.

Conflicts:
	default.xml