Merge "remove redundant files" into tizen_2.2