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

Change-Id: I39948689f566a8f43e0c887ad66c04a97354fa8b