am 570b859a: am 4580c1b5: am de9f2919: am 30e1f0fd: am 9d5a03fb: Merge "Fix for com.android.cts.verifier.camera.video.CameraVideoActivity" into kitkat-cts-dev

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