update subtrees to use build tools 21.1.1