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

Change-Id: I47ffe6bc96dcab2e29073ff7b5f7b3e9e84b5fd4