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

Change-Id: I5074b548b864c276ed4cb7197511c6723e24e438