Merge "ecm_ipa: remove redundant code" into msm-4.8