Merge "Kbuild: Add ion header file" into msm-3.0