fixing v2 merge conflicts in aws-lambda and aws-codebuild

Author: corymhall

packages/@aws-cdk/aws-codebuild/lib/source.ts

@@ -672,7 +672,7 @@ abstract class CommonGithubSource extends ThirdPartyGitSource {
     this.buildStatusContext = props.buildStatusContext;
   }
 
-  public bind(scope: CoreConstruct, project: IProject): SourceConfig {
+  public bind(scope: Construct, project: IProject): SourceConfig {
     const superConfig = super.bind(scope, project);
     return {
       sourceProperty: {

packages/@aws-cdk/aws-lambda/test/function.test.ts

@@ -12,7 +12,7 @@ import * as sns from '@aws-cdk/aws-sns';
 import * as sqs from '@aws-cdk/aws-sqs';
 import { testDeprecated } from '@aws-cdk/cdk-build-tools';
 import * as cdk from '@aws-cdk/core';
-import { Lazy, Size } from 'aws-cdk-lib';
+import { Lazy, Size } from '@aws-cdk/core';
 import * as cxapi from '@aws-cdk/cx-api';
 import * as constructs from 'constructs';
 import * as _ from 'lodash';