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 am: 58218e1ffa
am: de10b391ee

Change-Id: Id2a2b2b773d5325d4a1a3c43499145f7c79fc389