Merge "Fix "end of file while inside a group" error in NDK" into sc-dev