Ah, didn't catch that.  Will remove USE_DEVICE_SPECIFIC_QCOM_PROPRIETARY.