Merge "init: expand generated attributes on sepolicy compile" into oc-dev am: 57d4c59559
am: be2bfc55f7

Change-Id: I85b3cc759756f3df399c913eb98887cc7c6abccf