am 5ff6fde9: Merge "Fix bugs regarding Camera Video test" into kitkat-cts-dev automerge: 7951d40 automerge: 19b8f3b

* commit '5ff6fde916d5e39a398ed8da15c0a12d75e154b1':
  Fix bugs regarding Camera Video test