[ARM] Merge SMP tree