am 96736b00: am 39cc7530: am 9f66254d: (-s ours) Merge "Enable integer overflow detection in libmedia"

* commit '96736b003e3ad2b08d861f40e3244dfeadac9b15':
  Enable integer overflow detection in libmedia