Merge "Revert "Use HCurrentMethod in HInvokeStaticOrDirect.""