Updated to include updates required to build aws_cli