Merge "display: define QCOM_BSP"