Merge "Exclude jdiff from build" am: a6b43f7ba6 am: 96820d9d3f

Original change: https://android-review.googlesource.com/c/platform/external/jdiff/+/2217162

Change-Id: I749de37f51fec66228c70eefa62473671d25de38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>