Merge "platform: msm_shared: Move macro to the right header file"