Changes to allow for libtpm2 compilation with marshaling code.
am: e85c65bf85

* commit 'e85c65bf85bc6251895cdfe6bb6213d125cc2366':
  Changes to allow for libtpm2 compilation with marshaling code.