Merge "msm: camera2: Swap CSID and CSIPHY sensor sub modules."