mm-core: Fix compilation errors due to compiler upgrade

Fix compilation errors due to compiler upgrade.

Change-Id: Ief277fb251d2ac2ffcd2784b3eece0544f42edee
2 files changed