Updated depeendencies to CM's Cafs and kernel

Change-Id: I7e9477ac45f6ccf1c8f330e0b9b08b5d9593ea18