Merge "Add METADATA to ipsec-tools: BSD+Apache2=NOTICE" am: 1441a73cb3 am: 956806ac15

Change-Id: Ib49c85d3b0533ac24038ea6a19b182c1c3020c52