Update aws & aws-cn (#2267)

* Update aws

* Update aws-cn

data/aws

@@ -8,8 +8,12 @@ acmvalidations.com
 acmvalidationsaws.com
 aesworkshops.com
 amazonaws-china.com
+amazonaws.biz
 amazonaws.co.uk
 amazonaws.com
+amazonaws.info
+amazonaws.net
+amazonaws.org
 amazonaws.tv
 amazonses.com
 amazonworkdocs.com
@@ -39,4 +43,5 @@ elasticbeanstalk.com
 thinkboxsoftware.com
 
 # AWS DNS
+regexp:.+\.amzndns\.(co\.uk|com|net|org)$
 regexp:.+\.awsdns-[0-9][0-9]\.(co\.uk|com|net|org)$

data/aws-cn

@@ -21,5 +21,6 @@ route53.cn @cn
 sagemaker.com.cn @cn
 
 # AWS CN DNS
-regexp:.+\.awsdns-cn-[0-9][0-9]\.(biz|com|net|top)$
-regexp:.+\.awsdns-cn-[0-9][a-e0-9]\.cn$
+regexp:.+\.amzndns-cn\.(biz|cn|com|net)$ @cn
+regexp:.+\.awsdns-cn-[0-9][0-9]\.(biz|com|net|top)$ @cn
+regexp:.+\.awsdns-cn-[0-9][a-e0-9]\.cn$ @cn