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

Change-Id: I3fec93a9dbee5fb2706704c8a9e65cf98ee22eda