Merge "Revert "Load MediaPlayer2 implementation with a linker namespace.""