Merge "platform: msm_shared: Fix compiler error when debug is enabled"