No CAF anymore

Change-Id: If41708c20a851ceb501731e8d9277a3e7c0697cf
Signed-off-by: Chintan Shah <cgintan1998@gmail.com>