DO NOT MERGE - stagefright: fix integer overflow error am: 1ab38dcf9b
am: 65cb362eb2

Change-Id: I41af2987f1d59d6dc6af03cf62925ba1bc4592aa