am 9b0483d5: am 5cdee205: Merge "Revert "runtime: cleanup class_linker out-parameters and formatting""

* commit '9b0483d5ac74f846c0cbd45779e758c942085ee5':
  Revert "runtime: cleanup class_linker out-parameters and formatting"