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

Change-Id: I3d77e50ac473423b0745fd4d0867040229e913aa