Merge "display: define ANDROID_JELLYBEAN_MR1 outside TARGET_USES_QCOM_BSP"