FIX ME || TEMP REVER || "av: Additional ifdefs for QCOM DirectTrack"

This reverts commit 36355ee6df31877e05cae837a01fdca7f723d702.

Change-Id: I40ed9301dd5a90330eb6233667f03aa839d07fe0