Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-dev am: 8f4b1a7de0  -s ours am: 64c06e051a am: bbc4b190d0 am: 559b777d4f  -s ours am: 1d39eeea17 am: 3f5bbfce01 am: 94ec2dd388 am: 2e7021aeae  -s ours am: 53424fe60e
am: 18056e4013

Change-Id: I92c61d1d5f660610a4270fcbf4a972a6257483ff