Merge "msm: barriers: Add explicit #include <mach/memory.h>" into msm-3.0