Merge "Revert "Enable uapi kernel headers for arm.""