am 18c3a185: Merge "Fix warnings in sample detected by NDK_ANALYZE=1"

# Via Andrew Hsieh (1) and Gerrit Code Review (1)
* commit '18c3a185c64a87791ccedb802203fda7b5290916':
  Fix warnings in sample detected by NDK_ANALYZE=1