Fix AWS::EC2::VPC resource delete failure

Check resource_id is not None before deleting the resource.

Change-Id: Ib8e8de5badc54c79cee248a9fcc86ebc50397b00
Closes-bug: #1365924
Merge "Fix AWS::EC2::VPC resource delete failure"