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

Change-Id: I010d8afaa33dbeb4b0428cfbf91a848eeb926887