Merge "Adding mk file for CTPM's new sepolicy" into tm-dev