Updated to current buildtools revision