Merge "Revert "runtime: cleanup class_linker out-parameters and formatting""