merging changes to embxx.
Fixing some build error after merge.