Merge "DO NOT MERGE - stagefright: fix integer overflow error" into nyc-dev am: 500412d788
am: 38aeee19fb

Change-Id: I63c5b0fe0df8e597c54f720afca02b4646d3028d