Merge "gn2bp: Fix arch-dependent cc_genrule"