Merge "Add the common directory back to kernel headers."