Merge "Follow the include-order coding conventions" into tizen