Merge "build: standardize usage of TARGET_PRODUCT for qcom chipsets."