Cleaning up serialVersionUIDs

Change-Id: If7b8ed2d5f880734257230b8cbf4a9c7ebce9a96
15 files changed