Revert "stagefright: Fix mismerge"

This reverts commit 938bec9ff0fa5f9186d59efd23d99cfb1f8d7260.

Change-Id: I975d11e9823830327b217ffb8c16dbc1a6c124aa