Merge "Add METADATA to wpa_supplicant_8: BSD+Apache2+ISC=NOTICE" am: 59a98f01c4

Change-Id: I86a95c3767c48b6a64bed062e26a116609fa8221