Trump picks China critic Glass as Japan envoy