Merge "Fix cert-dcl16-c clang-tidy warnings in nuplayer." am: 83c76fb62f
am: 45dbe4cb02

Change-Id: Idc5b28ad12bb2b85a9478939c533d8c45d451b4a