frameworks/av: Fix errors from upstream CAF merge

Change-Id: I1d1a515f75366ae8c1989aeea1eed0ef036ce96d