Merge "platform: msm8994: Fix redundant macro definitions"