Merge "Remove LOCAL_LICENSE_KINDS from core makefiles."