Merge "DO NOT MERGE - stagefright: fix integer overflow error" into nyc-dev
am: 500412d788

Change-Id: I2ad97539236f70fc3153d06f0b98e8ac0645d427