Revert of Don't set the priority of the decoder to 'high' on Android.

webrtc/video/video_receive_stream.cc

 /*
  *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 292 matching lines @@
   }
 
   video_stream_decoder_.reset(new VideoStreamDecoder(
       &video_receiver_, &rtp_stream_receiver_, &rtp_stream_receiver_,
       rtp_stream_receiver_.IsRetransmissionsEnabled(), protected_by_fec,
       &stats_proxy_, renderer));
   // Register the channel to receive stats updates.
   call_stats_->RegisterStatsObserver(video_stream_decoder_.get());
   // Start the decode thread
   decode_thread_.Start();
-#if !defined(WEBRTC_ANDROID)
-  // On android, the decoding happens on a different thread and frames
-  // are delivered on that thread (that in itself needs to be fixed).
-  // In any event, the actual decoding work is higher priority than the
-  // |decode_thread_| on Android, so we only raise the deocode priority on
-  // platforms other than Android.
   decode_thread_.SetPriority(rtc::kHighestPriority);
-#endif
   rtp_stream_receiver_.StartReceive();
 }
 
 void VideoReceiveStream::Stop() {
   RTC_DCHECK_RUN_ON(&worker_thread_checker_);
   rtp_stream_receiver_.StopReceive();
   // TriggerDecoderShutdown will release any waiting decoder thread and make it
   // stop immediately, instead of waiting for a timeout. Needs to be called
   // before joining the decoder thread thread.
   video_receiver_.TriggerDecoderShutdown();
@@ skipping 165 matching lines @@
       rtp_stream_receiver_.FrameDecoded(frame->picture_id);
   } else {
     LOG(LS_WARNING) << "No decodable frame in " << kMaxWaitForFrameMs
                     << " ms, requesting keyframe.";
     RequestKeyFrame();
   }
   return true;
 }
 }  // namespace internal
 }  // namespace webrtc