Merge "Fix NDK libsync to match ndk/sync.h"