moto_msm8960: Use xt897 libril-qc-qmi-1 on all but Electrify M

 * This fixes the iccid on xt926

Change-Id: I5798e6816d5cee46505ce9e747e7be4647574e75
Merge branch 'cm-11.0' of github.com:TheMuppets/proprietary_vendor_motorola into cm-11.0