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

PS6: bring it inline with
     https://github.com/CyanogenMod/android_frameworks_av/commit/09dd0f0228d76be5476afbf5ffe3bfe6fd2aecdf

Change-Id: If0f85f5d86db60dbd6c7bf7fda704d92805b3c49