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

Change-Id: Iacaa5c1bb3cba4e2acf63f4e7a489d44baf03613