Merge "Fix verifier checks on interface methods."
am: 9a19be9c17

Change-Id: Ia1cf2ba505c805a7c3d721e858dc215b405e0254