Merge "Fix invoke-interface verification failures" into honeycomb