Merge "defconfig: Enable MSM_AVS_HW on 8960 targets"