Merge "Stagefright: Fix unused variables, functions, values"