Merge "Fix imx6qdlsabreauto machine configuration"