Merge "Restore the libsync __ANDROID_API__ guard"
am: 7af64cbbbe

Change-Id: I4a1883a8a750a8a2ac92f470b07a9b16df7d5150