am 89378fd1: Merge "Revert "Video editor CTS: Framework modifications"" into honeycomb

* commit '89378fd1666cd589599a0c5a7d0c71fa2f8159a5':
  Revert "Video editor CTS: Framework modifications"