Merge "gn2bp: fix collecting static libs dependencies"