Merge "Revert "Only spawn one binder thread for cmd."" into pi-dev-plus-aosp