Merge "Exclude jdiff from build" am: a6b43f7ba6

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

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