Merge "Add repo_diff tools"
am: 725af68e38

Change-Id: Ibb8f4de45c91ed6190d5d7ecce1e7129eeab2f6c