Merge "VideoEditor:Clear Surface API addition" into honeycomb