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

* commit '06c9662a2feddc86a37d3adb3e468d57067c3714':
  Restore tkill for LP32.