Merge "plat/arm: do not include export header directly" into integration