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

Change-Id: I4a38c82e157f3a8e57da1a7aad847eb2657e7278