Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-mr1-dev am: ee58cd8522 am: a28d14862a am: f3cfa7f815  -s ours am: 7ab70a7ba9 am: 7543b66cfd
am: bfceea2523

Change-Id: I899dc6fff399ae80238f6bb3147612f2e018538c