Cleaned up QCOM_HARDWARE macros