Merge "Output diff result to stderr"
am: aa2b5e1a70

Change-Id: I75fccf394c7f29483c3811692e1fcc74415afc1d