Merge "msm: Explicitly give the address of L1 and L2 buffers" into msm-3.0