am 32a2775e: am 85f77c2b: Merge "Unmarshall PFDs properly when hand-crafting interface stubs" into klp-dev

* commit '32a2775e529d13dfd34273a3b4af5151435720b2':
  Unmarshall PFDs properly when hand-crafting interface stubs