Merge "defconfig: 8226: Enable ETM on MSM8226"