HALO
Merge branch 'jb-mr2' of https://github.com/IOKP/vendor_iokp into jb-mr2

Conflicts:
	configs/common.mk