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

Change-Id: I1ce8bc025251215d634c75037f4369b6a8c30968