Merge branch 'ndk-r11'