Merge "Add license type: Apache+BSD+MIT+libpng is NOTICE"