Merge "Migrate JDiff to new Javadoc" am: 5bf68823e6 am: 4d1cce4123 am: d19bba5454 am: 66258fb653

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

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