DO NOT MERGE - stagefright: fix integer overflow error am: 17a10c50e2 am: 8df5df78a3 am: e40e452a3a  -s ours am: 87d4805d94  -s ours am: 3041de70c5 am: 0c51e9905d am: f3da79cfea  -s ours am: a47d63df6f am: b88ce695e4 am: c9919f953a am: 3aa706059b  -s ours am: 09170c0ec5
am: 82a7b77967

Change-Id: I6c2b4a338236f66da809d006e0643050e537fb45