Baker & McKenzie Japan ally expands with Tokyo merger