Merge "Add Zuk z2 for mauronofrio"