Merge "Add script for running diff easily"
am: 34445d5083

Change-Id: I1dceba23fc04fe690a025641231ff78cc53a8c19