Merge "Move tools and ADT to 19."