am 255789e4: Merge "Restore tkill for LP32."

* commit '255789e4d12d95dbb8e34cfae7fdc58514843ba5':
  Restore tkill for LP32.