Merge "libbinder: simpler scope_guard implementation" into main