Restructure X3 init to accommodate kernel changes.

Change-Id: I30fe0341836303c1d492848bfffbc4e058c9550c