Merge "Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir"