Merge "libsepol: cil: Keep type[attribute] declarations when attributizing."