Merge "stagefright: Remove unused hooks from AudioPlayer"