Use frameworks/media/libvideoeditor from CM

Change-Id: I938bdc9335b26fe1f9cec5fed41489696f5a9a30
Merge remote-tracking branch 'upstream/ics' into ics