[iMX Rebase] Fixed make files and conflicts with rebase