Merge "Re-enable uapi kernel headers for arm."