Merge "[msm7630_1x]: Add msm7630_1x target to support 1.x modem builds"