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

Change-Id: I8fca7fcfb5052f67228d3c5a86cac7b21fc0736a