Merge "qcacmn: Attach 2x2+1x1 action tables"