Merge "stagefright: Handle DEAD_OBJECT correctly in conversion"