Merge "remove ospcompat" into tizen_2.1