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

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

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