Merge "libsync: ndk: Fix compilation in C mode." into oc-dev