am 2bc6813a: Merge "Fix build-art-target and build-art-host rules."

* commit '2bc6813a990894b88a392a3cded13ddff2f14d04':
  Fix build-art-target and build-art-host rules.