Merge changes I60f883c0,Ie5955865

* changes:
  Mark libsync as LL-NDK
  Fix NDK libsync to match ndk/sync.h