Update for newer CAF

Change-Id: I8520fc323d49fc037b5691fc9c6c690475985fcf

Conflicts:
	BoardConfigCommon.mk