am 05d6f67f: Merge "Set host and device arches from product variables"

* commit '05d6f67ff75c319e4abe2d70984872f4b8407ac1':
  Set host and device arches from product variables