Merge "msm: iomap: Clean up unified I/O map selection"