Merge "Allow target arch in tapas parameters." into jb-mr1-dev