Merge "Binder NDK tests: use std::mutex, not android::Mutex" into main