Refactor to use repo qcom-common

Change-Id: I25d16d615be4ca32b125ae776a403b841ee812f2