Use Mach-Ux500 from Samsung
Implement 3.4 changes as we go