Merge "Change a Stagefright assert to an error check."