Revert "Fix build for non-AV-ENHANCED or non-QCOM boards"

This reverts commit 6d35f2956639f78f0171a355178b84a3fb5f5c6b.

Change-Id: I1fc71b527f8eed643c92994e23f38b15d4253065