Using xia.mk for definitions.
Merge branch 'reorganize' of https://github.com/XIA-Project/xia-core into reorganize