Fixed broken EnumTest

A previous file move changed the class name for various classes used
in the EnumTest. That broke the tests as they relied on files
containing serialized forms of those classes and so had hard coded
references to the old class names which no longer existed. The fix
was two part:

- Use the correct class names in the serialized files
- Remove duplicate serialized files that are no longer used

Bug: 12491225

Change-Id: I60b503bb2509071ccac5fec7b05dd5160d9dd7d0
11 files changed