Merge "hwc: featurize using QCOM_BSP"