am 9ed99405: Merge "Video editor API update - rework for Patch Set 3" into honeycomb

* commit '9ed99405ae8cdd9038071a872e7d92cf256f2165':
  Video editor API update - rework for Patch Set 3