Android O MR1 Preview 1
Merge "libsync: Fix a double-free."