g2-common: update qcom and caf configs

Change-Id: Icb54e5f5be40722d7075ab38acbd74906ddbcba9