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

Change-Id: Ia87ece0e1593c8d14dafd9d45277f278d0197cc0