Merge "VideoEditor:Fix for 3384150 and 3369908" into honeycomb
tree: 3837c44f64597c3d6410bb5fa223782a2d33ad13
  1. libvideoeditor/