Merge "Restore the libsync __ANDROID_API__ guard" am: 7af64cbbbe am: 9b97896a74 Change-Id: I3d6eaa76578e4ef11fbe2d0c08fb0f3d2066bf34 Cr-Mirrored-From: https://chromium.googlesource.com/aosp/platform/system/core Cr-Mirrored-Commit: acd1f81dfe7d6812c8ba7bcc3ec84bfb041d63bb