Revert "msm8974: underp variant :("

This reverts commit 1cd0c0c3f8495f0d5e8e13bcc094d29027a3c46e.
Revert "msm8974: Use CAF RIL variant"

This reverts commit b922a32578dfec202d4ae10d6cbc07fce68962b8.