Merge "Revert "Revert "Use HCurrentMethod in HInvokeStaticOrDirect."""