diff --git a/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc b/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
index 0387225686..324e3a268e 100644
--- a/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
+++ b/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
@@ -27,6 +27,7 @@
 #include "modules/video_coding/codecs/vp8/reference_picture_selection.h"
 #include "modules/video_coding/codecs/vp8/temporal_layers.h"
 #include "system_wrappers/interface/tick_util.h"
+#include "system_wrappers/interface/trace_event.h"
 
 enum { kVp8ErrorPropagationTh = 30 };
 
@@ -384,6 +385,9 @@ int VP8EncoderImpl::Encode(const I420VideoFrame& input_image,
                               input_image.timestamp());
   }
 
+  TRACE_EVENT1("video_coding", "VP8EncoderImpl::Encode",
+               "input_image_timestamp", input_image.timestamp());
+
   // TODO(holmer): Ideally the duration should be the timestamp diff of this
   // frame and the next frame to be encoded, which we don't have. Instead we
   // would like to use the duration of the previous frame. Unfortunately the
diff --git a/webrtc/video_engine/test/android/jni/Android.mk b/webrtc/video_engine/test/android/jni/Android.mk
index b3c0822bc2..4f5dd89433 100644
--- a/webrtc/video_engine/test/android/jni/Android.mk
+++ b/webrtc/video_engine/test/android/jni/Android.mk
@@ -335,7 +335,6 @@ LOCAL_STATIC_LIBRARIES := \
     libsignal_processing \
     libsignal_processing_neon \
     libcommon_video \
-    libsystem_wrappers \
     libcpu_features_android \
     libaudio_device \
     libremote_bitrate_estimator \
@@ -347,6 +346,7 @@ LOCAL_STATIC_LIBRARIES := \
     libyuv \
     libwebrtc_i420 \
     libwebrtc_vp8 \
+    libsystem_wrappers \
     libjpeg_turbo \
     libaudioproc_debug_proto \
     libprotobuf_lite \