Merge "Fix bugs regarding Camera Video test" into kitkat-cts-dev
automerge: 7951d40

* commit '7951d40bb73acd12cc80624814100b2540e27d28':
  Fix bugs regarding Camera Video test