Use Content objects for diffing in UpdatedDefinitionAid

Bug: 47628
Change-Id: I2b0a7648c136d58516013724ef3176b33ec30be3
Merge "Use Content objects for diffing in UpdatedDefinitionAid"