am 43498ce6: am 66c50ccc: Merge "runtime: cleanup class_linker out-parameters and formatting"

* commit '43498ce63eefeb2c3fad59592ce240c42d655441':
  runtime: cleanup class_linker out-parameters and formatting