Switch to AOSPA qcom/common