Merge "msm: arm64: fix compiler warnings due to improper braces or indentation"