Merge "move sync headers from include to libsync"