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

# Via Andrew Hsieh (1) and others
* commit 'b070a3d46b1f1f0cf6efeb6991f428652a82a97c':
  Fix warnings in sample detected by NDK_ANALYZE=1