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

Change-Id: Ia11274766558572140990eb85f3e1245810b8151