Merge "libsync: Fix a double-free."
am: 16dd491aac

Change-Id: I3df91f1d203423dd5f0ca6335812630c25d8bc01