Revert "CAF cleaning"

This reverts commit 5bc8079968229d35b241616c3602805ce658cbc1.

Conflicts:

	device.mk
Revert "Build with JWR kernel"

This reverts commit a6c0f852c0341c96243646ca184c991ea1aeac30.