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

Change-Id: I34b848bb342d779a2213524998fc48b400b62d41