Merge "msm: mhi_dev: Reorganize the mhi header file"