Merge "Convert jdiff to Soong"