samsung: merge changes to modem/sdio

Change-Id: Ia2f59a6e51b7f5cf980b3ed2d59ce4f5d716b7fb