Merge "Fix -Wextra warnings in frameworks/av/include" into oc-dev
am: ae1c19fc33

Change-Id: If3add1611a67a1b4375975c0ec4d1d6ec603d3d9