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

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

Change-Id: I86280258e7435c0563a7f479ea9947d53f6f9c4e