Remove failed build directories
Merge branch 'update' into update.linux