Merge "Merge revised headers" into tizen_2.1