Merge "gn2bp: Add desc.json with target_cpu=x64"