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

Change-Id: I407f0aee2d3d97e9a5f8649bcd5eafba5413d416