Merge branches 'cleanups/mxs', 'cleanups/mx3-defconfig' and 'cleanups/includes' into...