Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-dev
am: 8f4b1a7de0  -s ours

Change-Id: I5ccb9ee7ddd79e6a3599c1e53ff0247c0af50bf4