Merge "binder: replace android_atomic_add with std::atomic" into main