Merge "msm: pil: Remove dependence on iomap.h"