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
am: 13b7fceb5a  -s ours

Change-Id: If5c1aefb367a9c4900c6775ab8f5b07734a148eb