Merge "libsepol: cil: Keep type[attribute] declarations when attributizing." am: 970199321d
am: aa604d7ad5

Change-Id: Id642c1c557aea8042e574314b4a7c8d5ede44f4c