am 57748282: Merge "Optimize method linking"

* commit '57748282c085ea29ab1c6d4188c79e5fe115ffa0':
  Optimize method linking