am 9fcc2da4: Merge "Remove VideoEditor"

* commit '9fcc2da4db19472dd92e6f9362fbcd1b2912af04':
  Remove VideoEditor