Merge "Add license type: ISC+BSD+MIT+OpenSSL+zlib+Apache2" am: 217d07615e am: 1277ffb01b

Change-Id: I57f1b07300c0e42d48a1023bf0d3198f014526f7