Merge branch 'master', remote-tracking branch 'upstream/master'
Fix build error with NDK R9
Merge pull request #62 from rtfb/master

Fix build error with NDK R9