Merge "/bin/wifi:  WDS/4-address mode support for APs."