Revert "Add ifdefs for QCOM-specific features"

This reverts commit 813fcb5f9af6bdc06c6310f26379a41ea67a3211.