Merge "stagefright aacenc: Avoid warnings about incompatible pointer types"