Merge "Fix cert-dcl16-c clang-tidy warnings in media/extractors." am: cd4c042fdd
am: dc3102d3ed

Change-Id: I1f69637b8413e4d5ccb96cda4335fc20c6438820