Manual merge of ndk branch