am 2bfde572: am 29c12755: Merge "libutils: fix overflow in String8::allocFromUTF8" into mnc-dev

* commit '2bfde57237209675e2375ea66185a3e050ca246f':
  libutils: fix overflow in String8::allocFromUTF8