Revert change of test automerged from master

Change-Id: I2c28ca62129f190b9f71249d53731e7220358474
diff --git a/vm/test/AtomicTest.c b/vm/test/AtomicTest.c
index e976d8d..ce018bb 100644
--- a/vm/test/AtomicTest.c
+++ b/vm/test/AtomicTest.c
@@ -345,7 +345,7 @@
     swapTest = 0x11111111;
     android_atomic_and(0xfffdaf96, &andTest);
     android_atomic_or(0xdeaaeb00, &orTest);
-    int oldSwap = android_atomic_swap(0x22222222, &swapTest);
+    int oldSwap = android_atomic_acquire_swap(0x22222222, &swapTest);
     int oldSwap2 = android_atomic_release_swap(0x33333333, &swapTest);
     if (android_atomic_release_cas(failingCasTest+1, failingCasTest-1,
             &failingCasTest) == 0)