Merge "Add repo_diff tools" am: 725af68e38 am: 06ad379c6e
am: df63f18a01

Change-Id: I3be847e238cf09d33033538c6ab40cc8994474b2