Merge "Change Android.mk file to use the new location after /frameworks/media/libvideoeditor source files are moved"