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

Change-Id: I007326cf211d31807e3692daf620be3a8f106a3c