Merge "target: apq8084: Add support for UFS"