MB-11060:  look for matching ARCHITECTURE if NOT x86, amd64

Change-Id: Iba1bcc708ac71533c56ea47876442575772f3f3f
Reviewed-on: http://review.couchbase.org/41831
Reviewed-by: Philip Labee <philip@couchbase.com>
Tested-by: Philip Labee <philip@couchbase.com>