am 3730f8be: am ba71601a: (-s ours) am 29c12755: Merge "libutils: fix overflow in String8::allocFromUTF8" into mnc-dev

* commit '3730f8beffa99cc439dff63f24020e03e39e443c':