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

Change-Id: I7210069708eefb8b5c10d5a5845668eb1c45b0f4