Merge "Revert "Revert "Add license metadata to non-module targets."""