Merge "Clean up the special input in HInvokeStaticOrDirect." am: 53ced034cd
am: 6221a7024f

* commit '6221a7024f97f0e91904b58280278883f4aae98b':
  Clean up the special input in HInvokeStaticOrDirect.