Merge "Revert "vendor-freeze: Update build file of dependent module"" into s-keystone-qcom-dev