Merge "Update Andorid.bp to use DnsResolver v13" into main