Merge "Convert jdiff to Soong" am: 9335763d33 am: fa10df3198
am: 54e26747b0

Change-Id: I07032d2a059c39fe1c3c02234b809d1ac2da55e4