caf: update caf branches

Change-Id: I9eae097479778ecf4bc5e44029be43446287a6f0