Revert "[vm] Implement more efficient CAS in simarm/simarm64 modes"

runtime/vm/atomic_android.h

Index: runtime/vm/atomic_android.h
diff --git a/runtime/vm/atomic_android.h b/runtime/vm/atomic_android.h
index b5fb34d620c4c45b7115bf3f45ee66be855815f1..8b536953338025adfcd19c59a9c2ea2844836b51 100644
--- a/runtime/vm/atomic_android.h
+++ b/runtime/vm/atomic_android.h
@@ -43,6 +43,7 @@ inline void AtomicOperations::DecrementBy(intptr_t* p, intptr_t value) {
   __sync_fetch_and_sub(p, value);
 }
 
+#if !defined(USING_SIMULATOR_ATOMICS)
 inline uword AtomicOperations::CompareAndSwapWord(uword* ptr,
                                                   uword old_value,
                                                   uword new_value) {
@@ -54,6 +55,7 @@ inline uint32_t AtomicOperations::CompareAndSwapUint32(uint32_t* ptr,
                                                        uint32_t new_value) {
   return __sync_val_compare_and_swap(ptr, old_value, new_value);
 }
+#endif  // !defined(USING_SIMULATOR_ATOMICS)
 
 }  // namespace dart