msm8974: Use CAF RIL variant

 * Required for QCRIL CS release

Change-Id: If32ab99eaebbdf5f315d182444d2e572636e115c
msm8974: underp variant :(

Change-Id: I7d480f8b4288c87dfb411af7a0f90c5ae8799673
Merge remote-tracking branch 'cm/cm-12.0' into sm-5.0