Merge "Add METADATA to jdiff: LGPL+GPL=RESTRICTED" am: a62cf319f0

Change-Id: I3607dd13c91ad83ebc8848ef4afe2b9498a2e0ba