Merge "Remove TARGET_USES_QCOM_BSP from vr/sensord"