Merge "msm: board-8960: Don't add modem devices on APQ targets"