Merge "Remove empty tools directory" into stable/magnesium