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

Change-Id: I61e548c944a76d06caa983c6dfe7fdc31a956511