Android U Beta 1 GPL
Merge "Exclude jdiff from build" am: a6b43f7ba6 am: 96820d9d3f am: 6b1e2a88d4 am: a8029ae0d5

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

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