am 7951d40b: Merge "Fix bugs regarding Camera Video test" into kitkat-cts-dev

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