Revert "[aws] aws bootstrap uses stuff from the aws_cpi so it need to use ResourceWait too"

This reverts commit 5afcbfe5f61e605052b408814074721fb0a206ad.
Revert "[aws_cpi] use new ResourceWait class"

This reverts commit 320a713edcff4162faa6067ffce557c3f2d32d78.