Merge "Merge \\"Revert \\"Revert \\"Fix ArtMethod::GetInvokeType for static...
Merge "Merge \\"Revert \\"Revert \\"Fix ArtMethod::GetInvokeType for static methods on interfaces.\\"\\"\\" into nyc-dev am: 355d93ca am: 6fd5aa65" into nyc-mr1-dev-plus-aosp