am e1259d63: am 202729a0: am 14c2823a: Merge "add strutils"

* commit 'e1259d633c084bb7516b76a859c6acae20b06aee':
  add strutils