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

Change-Id: Ia482954362156d923126e1e2ecccef08b6e4c427