Merge "Fix warnings in sample detected by NDK_ANALYZE=1"