Merge "Generate source files into arch-neutral dir."