am 4d8c1d22: (-s ours) am f468d1e1: am 1d44be87: Merge "libutils: fix overflow in String8::allocFromUTF8"

* commit '4d8c1d22231fadc190f7af9febfd2ba2cad0acf8':