Merge "DO NOT MERGE - stagefright: fix integer overflow error" into nyc-dev am: 500412d788 am: aad4991f4b am: 8e3a746f8c
am: 8117307939  -s ours

Change-Id: Ic7668bb0f297c7bbf05eabf228fc9e9feb762791