Move QCOM enhanced features under QCOM_SW ifdef

Change-Id: Icff5c9c3cafb7b326ae62f85da34f613694ff140