Merge "Add miscellaneous tests for class redefinition." am: 9641c9abf5
am: 2ff31f8843

Change-Id: Id7983dc9be98696f7212f5babd98d76cb8e5f81a