Soo maybe we do need audio-caf...

Change-Id: I5946cb6d4b59ec1985eea9b621a94ef4090891bb
Merge "Soo maybe we do need audio-caf..." into jb4.2