Merge "seandroid: Restructuring sepolicy codebase"