Merge "libsync: Fix a double-free." am: 16dd491aac am: 12f6c4809e
am: 614fc323ff

Change-Id: I4f19d7b30e1218a1ec5d51570c273b5e2dcfd522