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

Change-Id: I0a099a5fc8d3c4c188380b78c7acf8c4239c8b38