Remove cm dependencies & add system.prop

Change-Id: Iea8c5ac40eca4429f2e81bce420b40f9986c0c97