Merge "Fix sdk-addon build on build servers"