builder/amazon: rename availzone to availability zone
builder/amazon/instance: support AZ here too