Merge "gpiomux-8974: Add EPM GPIO markers" into msm-3.4