remerge z4u-storage to board-msm7627a-storage