Merge "MediaPlayer2Impl: pack source info into subclass"