Merge "gn2bp: Make ldflags arch specific"