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

Change-Id: I523c85fc0856656d01f2a8cffcb3d8df3a1b2963