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

Change-Id: I089103c8f98f6819bfe2e6ce3d229bdf5d9ddb9c