am 1e1cfa25: Merge "Restore build-art minimal build"

* commit '1e1cfa25d603ae882c6d362f4a90f546164dbdba':
  Restore build-art minimal build