stagefright: Fix mismerge

Change-Id: Ic3576e6e35d0ea071f77eca25afa7b375cabc552