board-msm8x60: q1: fix compile errors

Change-Id: I748747ce1866b6c42606f33cf79b74926621cf23
Merge branch 'cm-10.1' into martincz