am a80a60fe: am 34f70071: Merge "Fixed benign overflows triggered by tests CVE-2015-1538-1 and CVE-2015-1538-2 in CTS."

* commit 'a80a60fe98b49a85368ebfe454ccf9d276d95813':
  Fixed benign overflows triggered by tests CVE-2015-1538-1 and CVE-2015-1538-2 in CTS.