Merge branch 'cross-platform/debug_ll' into imx/imx6q