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

Change-Id: Icbc3aa2db7297be677de0e40f0dc879c462d929f