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

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

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