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

Change-Id: Ib0b63974f20965a59c771343eaf1f647c5cb17ec