Merge "add videoeditor libraries to make" into honeycomb