Merge "Frameworks/base: Fix old code in MediaPlayer"