Merge from aws/aws-sam-cli/develop #470

Job	Run time
build-x86-container-1	16m 5s
build-arm64-container-2	21m 30s
terraform-build	17m 57s
build-x86-container-2	18m 43s
build-x86-1	18m 25s
build-arm64	10m 59s
terraform-start-api	17m 39s
package	17m 25s
build-arm64-container-1	12m 15s
terraform-invoke-start-lambda	18m 12s
build-x86-2	18m 4s
deploy	24m 15s
tier1-windows-build-1	15m 15s
local-invoke	19m 3s
other-and-e2e	32m 36s
local-start-lambda	9m 18s
tier1-windows-other	18m 57s
tier1-windows-build-2	20m 45s
sync-code	25m 14s
cloud-based-tests	24m 36s
sync-watch	20m 26s
local-start-api	26m 52s
tier1-windows-build-3	20m 54s
tier1-finch	27m 47s
	7h 53m 12s

Provide feedback