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

* commit '4e30dc4e5016e2ce9980ed9433e3ee62861aba74':