Merge "stagefright amrwbenc: Remove a duplicate, unused file"