Remove cm dependencies & add system.prop

Change-Id: I276c03043eae3a9eb935c91b2e65e14cb8381122