Merge "board-8974: Remap AUX data of msm_sdcc.x to sdhc devices"