Revert "stagefright: fix compile a second time"

This reverts commit fe526165ffd75809976c8cc1af7fd24b7db2bcde.

Change-Id: Ia69c563306fbed3ea512a30d5ab8be1e310e936d
Merge "Revert "stagefright: fix compile a second time"" into kitkat