Merge "diag: Re-organize HSIC/SMUX support"