VideoCapturerAndroid, handle cvo correctly

talk/app/webrtc/androidvideocapturer.cc

Index: talk/app/webrtc/androidvideocapturer.cc
diff --git a/talk/app/webrtc/androidvideocapturer.cc b/talk/app/webrtc/androidvideocapturer.cc
index c4c5a480b4f759253d7062f0f2c8e671540259ca..cb82b98e328f442fdc0411b02f69f345405c78d5 100644
--- a/talk/app/webrtc/androidvideocapturer.cc
+++ b/talk/app/webrtc/androidvideocapturer.cc
@@ -104,10 +104,13 @@ class AndroidVideoCapturer::FrameFactory : public cricket::VideoFrameFactory {
     if (buffer_->native_handle() != nullptr) {
       rtc::scoped_refptr<webrtc::VideoFrameBuffer> scaled_buffer(
           static_cast<webrtc_jni::AndroidTextureBuffer*>(buffer_.get())
-              ->CropAndScale(cropped_input_width, cropped_input_height,
-                             output_width, output_height));
+              ->CropScaleAndRotate(cropped_input_width, cropped_input_height,
+                                   output_width, output_height,
+                                   apply_rotation_ ? input_frame->rotation :
+                                       webrtc::kVideoRotation_0));
       return new cricket::WebRtcVideoFrame(
-          scaled_buffer, input_frame->time_stamp, input_frame->rotation);
+          scaled_buffer, input_frame->time_stamp,
+          apply_rotation_ ? webrtc::kVideoRotation_0 : input_frame->rotation);
     }
     return VideoFrameFactory::CreateAliasedFrame(input_frame,
                                                  cropped_input_width,