There was some redundancy between builtin_types[] and builtin_type_qtypes{}. Merge them into one. Backports commit b52c4b9cf0bbafdf8cede4ea1f62770d86815718 from qemu