av: fix mismerge - some constants appeared twice

Change-Id: Ibe1ae6dad47f4d37eb2a026d5e89005298593d04