Merge "defconfig: Enable support for tricolor leds for 8x25" into msm-3.4