[stagefright] rebase fix