Merge "defconfig: apq8084: Enable SMP2P"