Merge "Fix -Wextra warnings in frameworks/av/include" into oc-dev-plus-aosp
am: 30d02c74d6

Change-Id: Icebe5ad00a2ea3df003b16bfcd2931cc2255bed5