Remove cm dependencies & add system.prop

Change-Id: I8b19a8b3008b8560fdaf64955aa571ef5b0ede79