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

Change-Id: Ie03f3a35ead1ed573c94ae085c761c7025bc9e63