cleanup
Fix makefile call order
SeLinux changes
Merge CM changes