Merge "arm: Move to upstream udelay via timer implementation"