am 09f2d36e: (-s ours) am 5b33306d: Merge "libutils: fix overflow in SharedBuffer [DO NOT MERGE]" into mnc-dev

* commit '09f2d36e1d2bf5c4de5f21ace5378cc96618686c':