Merge "Don't diff records / enums already diffed through referenced type diffs." am: 336b2ecfbb
am: b8a122ab60

Change-Id: I98e9da9b4ed4974960fb66d5f0f21e49a91618ef