Update build scripts after merge r127116
21 files changed