Merge "stagefright: fix integer overflow error"