Merge "Enable uapi kernel headers for arm."