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

Change-Id: I7cce170e57c1fd285592a209bea5e51694d723bb