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

Change-Id: Ibb838a504e61b142c33cbf6a9ed6e27d478dcbd2