In replaceNonStdLicInFile, change orgNonStdLics to SPDXLicenseInfo[],
improve compare code as comparing two lincese directly. In
mapLicenseInfo, change return to "license"

Signed-off-by: gling07 <linggang7@gmail.com>
Merge remote-tracking branch 'github/develop' into develop