Corrected static field resolution.

It's legal (at the bytecode level) to have two fields with the same name
but different types.

Fixes http://b/issue?id=1788918 / http://b.android.com/2422
1 file changed