Revert "Revert "Revert "Remove incorrect android_atomic_...64 use."""

This reverts commit 66629e0de532376fa3ef43175ad05eccd21114da.

Change-Id: Ic298b345d0e500d18e4297b00e755ce3340f13fb
diff --git a/include/binder/Binder.h b/include/binder/Binder.h
index 86628a0..ba3ac4b 100644
--- a/include/binder/Binder.h
+++ b/include/binder/Binder.h
@@ -17,8 +17,6 @@
 #ifndef ANDROID_BINDER_H
 #define ANDROID_BINDER_H
 
-#include <stdatomic.h>
-#include <stdint.h>
 #include <binder/IBinder.h>
 
 // ---------------------------------------------------------------------------
@@ -71,7 +69,7 @@
 
     class Extras;
 
-    atomic_uintptr_t    mExtras;  // should be atomic<Extras *>
+            Extras*     mExtras;
             void*       mReserved0;
 };