av: merge qcom CAF kk_2.7_rb18

Change-Id: If98500d59270b1b8042825053b2015da8fe97af8