Merge "Revert "Use cil_write_build_ast""