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

* commit '8516d892378f0998a37d60db813517cc9f57ca2f':