Merge "Fix warning compiling samples with clang3.1"