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