Make fork mergable with upstream tnwince repo.