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

Change-Id: I1fcfb721f80e7539c84603759a3a128be38a4d26