Merge "Fix cert-dcl16-c clang-tidy warnings in libstagefright."
am: 55e72131c2

Change-Id: I7d05d4ef06731e821e4798c7feea2fc238a12970