Merge "MediaPlayer2: use ParcelFileDescriptor"