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

* commit 'ba71601aacb3846d7c83cfc89fff689e1b774c54':