Merge "platform: msm: fix s3 source macros"