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

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