Sync with CM-12
Rename sepolicy directory source
Use correct path form Term