Merge "Fix C compatibility in header." am: e06d19ff2c am: de35d2de57 am: 2cfdd9cd30 am: 91e6aaf902 am: fac344fd09

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1323276

Change-Id: Ieb960ac271ae4efa210539d3d307f7cd26b77499