am 5635946f: am 9fcc2da4: Merge "Remove VideoEditor"

* commit '5635946ff81005148799e8fd96557f5beb76daa3':