Merge "Add METADATA to jdiff: LGPL+GPL=RESTRICTED" am: a62cf319f0 am: 1508d2b9c7 am: 95d5f57b36

Change-Id: Ic54b22d98667687e6fa1eb395e7ff962a3b0622e