msm8660-common: fix mismerge

Change-Id: I5fba005fe0b7b34c19cc647a4ec52c381dbfd9d8