This reverts commit b1d3124f.

Because structure changes that blocks gki, revert it.
This will increase the power consumption of VCC_MAIN by 70mw during 8qxp suspend.
This will cause VCC_MAIN power consumption to increase by 46mw and VCC_MEMC to
increase by 10mw during 8qxp suspend.

Signed-off-by: Zhipeng <zhipeng.wang_1@nxp.com>
Change-Id: I0cc302a42f238eb1ee9a6dffc320554cb7c5ceb0