am ea6ba650: am bbf39ae4: Merge "Fix for com.android.cts.verifier.camera.video.CameraVideoActivity" into kitkat-cts-dev automerge: 9d5a03f automerge: 076e7ea

* commit 'ea6ba650ef21b6e909fbd9374b167f508241960b':
  Fix for com.android.cts.verifier.camera.video.CameraVideoActivity