Merge "Stagefright: Fix unused variables"