Merge \"Revert \"Revert \"Fix ArtMethod::GetInvokeType for static methods on interfaces.\"\"\" into nyc-dev
am: 355d93caa7

Change-Id: I72369b5487a89da88f0d718367277f98198a7b8d