Merge "Restore the libsync __ANDROID_API__ guard"