am 4a131250: am 030d8d0a: Fix several ineffective integer overflow checks

* commit '4a13125033f2130cadb4c48b3e6e0085d8c98829':
  Fix several ineffective integer overflow checks