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

Change-Id: I676a45acffc5d7d596776104fea701c340fbfc44