Merge "Revert "[LSC] Add LOCAL_LICENSE_KINDS to system/core""