Merge "Don't use cutils/Atomic.h" am: 9355446812
am: 6867db2980

Change-Id: Ia55205f8373e5a27e915f30a4501e1808b351195
diff --git a/6515/libsensors_iio/MPLSensor.cpp b/6515/libsensors_iio/MPLSensor.cpp
index 67cc010..acae228 100644
--- a/6515/libsensors_iio/MPLSensor.cpp
+++ b/6515/libsensors_iio/MPLSensor.cpp
@@ -30,13 +30,13 @@
 #include <sys/syscall.h>
 #include <dlfcn.h>
 #include <pthread.h>
+#include <cutils/atomic.h>
 #include <cutils/log.h>
 #include <utils/KeyedVector.h>
 #include <utils/Vector.h>
 #include <utils/String8.h>
 #include <string.h>
 #include <linux/input.h>
-#include <utils/Atomic.h>
 #include <utils/SystemClock.h>
 
 #include "MPLSensor.h"
diff --git a/6515/libsensors_iio/sensors_mpl.cpp b/6515/libsensors_iio/sensors_mpl.cpp
index 3f1b67a..9af10f4 100755
--- a/6515/libsensors_iio/sensors_mpl.cpp
+++ b/6515/libsensors_iio/sensors_mpl.cpp
@@ -30,7 +30,7 @@
 
 #include <linux/input.h>
 
-#include <utils/Atomic.h>
+#include <cutils/atomic.h>
 #include <utils/Log.h>
 #include <utils/SystemClock.h>
 
diff --git a/65xx/libsensors_iio/MPLSensor.cpp b/65xx/libsensors_iio/MPLSensor.cpp
index d63c0ae..1f42650 100644
--- a/65xx/libsensors_iio/MPLSensor.cpp
+++ b/65xx/libsensors_iio/MPLSensor.cpp
@@ -31,12 +31,12 @@
 #include <sys/syscall.h>
 #include <dlfcn.h>
 #include <pthread.h>
+#include <cutils/atomic.h>
 #include <cutils/log.h>
 #include <utils/KeyedVector.h>
 #include <utils/String8.h>
 #include <string.h>
 #include <linux/input.h>
-#include <utils/Atomic.h>
 
 #include "MPLSensor.h"
 #include "PressureSensor.IIO.secondary.h"
diff --git a/65xx/libsensors_iio/sensors_mpl.cpp b/65xx/libsensors_iio/sensors_mpl.cpp
index 5d52b1a..5c8397c 100644
--- a/65xx/libsensors_iio/sensors_mpl.cpp
+++ b/65xx/libsensors_iio/sensors_mpl.cpp
@@ -27,7 +27,7 @@
 
 #include <linux/input.h>
 
-#include <utils/Atomic.h>
+#include <cutils/atomic.h>
 #include <utils/Log.h>
 
 #include "sensors.h"