Merge "defconfig: mpq8092: Enable ION support"