Merge "Fix cert-dcl16-c clang-tidy warnings in libmediaplayer2."
am: b13d332cf6

Change-Id: Ie0f6cd6db03e2afb460672410636d3fe503f3727