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

Change-Id: I25493709f35ec048343e5033f7a5e8596e99157a