Merge "Stagefright: Fix default typo"