Reworked stagefright patch

In this way, build works again

Change-Id: I3de5d93c26bc8d5d2f5c3561c99a194c2e0f2f50