Merge "Remove rmtypedefs from the build system."