Hercules: Switched to Marla kernel and caf depenencies... again...

Change-Id: Ib7b1112f93b82a9b8e27515ea0c27c8aa94b23f2