Merge "stagefright: Wait longer before force releasing codec"