Merge "modify build steps for udpi"