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

Change-Id: If9c2c84c25f9496f85de53332d0c4a30443b6253