am 229642d9: am d9c4d2e9: Merge "Revert "Optimizing: Better invoke-static/-direct dispatch.""

* commit '229642d969173ec325d62bffcb7df57c73ac5ea6':
  Revert "Optimizing: Better invoke-static/-direct dispatch."