Fix serialization of class fields with same names.

Dex allows for fields to share a name if they have
different types. openJdk serialization code was not
handling this case properly.

Bug: 29721023
Change-Id: I3b8ea027f0af829e9f158d4bcb11a2052e34c10f
(cherry picked from commit 0885fcbb)