Remove cm dependencies & add system.prop

Change-Id: I52c91bd0569083b56a63d05a3753432b33059353