Merge "msm: 8610: Add support for identifying CDP and MTP boards"