Merge "stagefright: Move NULL check"