Merge "build: use arm kernel headers for arm 2nd arch builds"