Merge "ARM: remove indirection of asm/mach-types.h"