Merge pull request #163 from rsnel/ndk-r11