Merge "Fix TI user mode init manager to build with both old and uapi kernel headers."