tree 51301805e65b2557b6d6e69a63438ae475d225b7
parent 0d8a86b53b40b3e8e3b7392e7bf5c51dbd327101
author Florian Kriener <floriank@google.com> 1457439187 +0100
committer Yujie Qin <yujieqin@google.com> 1458222065 +0100

Integrate integer overflow fixes from security branch

cherry-pick of 1754202ed3e25b98179a4f377f0bdd605d9a157a for nyc-dev.

Bug: 26535130
Change-Id: I9a97903cb9f79131b426736351f0d0a0060294e5