Merge "libsync: ndk: Fix compilation in C mode." into oc-dev am: fb803d50d0
am: 409db49df8

Change-Id: Ic498ff2c35010988cdfeea107c313ed9ead09eaa