Import newer tpm-tools and a fixed trousers package, reported upstream