Merge "Add support for checking method and field invariants for redefinition."
am: 2e4777003b

Change-Id: If918feabed1f3d8d97ef740f4f11573757c099c5