diff --git a/libsync/include/sync/sync.h b/libsync/include/android/sync.h
similarity index 78%
rename from libsync/include/sync/sync.h
rename to libsync/include/android/sync.h
index d29ed85..68f74a0 100644
--- a/libsync/include/sync/sync.h
+++ b/libsync/include/android/sync.h
@@ -25,9 +25,16 @@
  * empty other than the ndk/sync.h include, that file will be renamed to
  * replace this one.
  *
- * New code should continue to include this file (#include <sync/sync.h>)
+ * New code should continue to include this file (#include <android/sync.h>)
  * instead of ndk/sync.h so the eventual rename is seamless, but should only
  * use the things declared in ndk/sync.h.
+ *
+ * This file used to be called sync/sync.h, but we renamed to that both the
+ * platform and NDK call it android/sync.h. A symlink from the old name to this
+ * one exists temporarily to avoid having to change all sync clients
+ * simultaneously. It will be removed when they've been updated, and probably
+ * after this change has been delivered to AOSP so that integrations don't
+ * break builds.
  */
 
 #include "../ndk/sync.h"
diff --git a/libsync/include/sync/sync.h b/libsync/include/sync/sync.h
new file mode 120000
index 0000000..3b17e48
--- /dev/null
+++ b/libsync/include/sync/sync.h
@@ -0,0 +1 @@
+../android/sync.h
\ No newline at end of file
diff --git a/libsync/sync.c b/libsync/sync.c
index e68cc89..27dab83 100644
--- a/libsync/sync.c
+++ b/libsync/sync.c
@@ -27,7 +27,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include <sync/sync.h>
+#include <android/sync.h>
 
 /* Legacy Sync API */
 
diff --git a/libsync/sync_test.c b/libsync/sync_test.c
index 9a5f7d8..f1ffdcf 100644
--- a/libsync/sync_test.c
+++ b/libsync/sync_test.c
@@ -22,7 +22,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <sync/sync.h>
+#include <android/sync.h>
 #include "sw_sync.h"
 
 pthread_mutex_t printf_mutex = PTHREAD_MUTEX_INITIALIZER;
diff --git a/libsync/tests/sync_test.cpp b/libsync/tests/sync_test.cpp
index 7770fcb..f08e97e 100644
--- a/libsync/tests/sync_test.cpp
+++ b/libsync/tests/sync_test.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include <sync/sync.h>
+#include <android/sync.h>
 #include <sw_sync.h>
 #include <fcntl.h>
 #include <vector>