Revert "av: fix mismerge - some constants appeared twice"

This reverts commit d985b799611bf6e3c21889f93748935c74307963.
av: fix CAF stupidness

* do CAF not test code when AV enhancements are off?

Change-Id: Iad58614e74e353df7b2e00473b5ca855cbf4c6ee