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