am 73c4fd76: am 1bc1c1c6: am 54d7cc51: am 2f2d8d40: am 7951d40b: Merge "Fix bugs regarding Camera Video test" into kitkat-cts-dev

* commit '73c4fd767a0255ec88fa7eae0bae396d8d910803':
  Fix bugs regarding Camera Video test