Remove cm dependencies & add system.prop

Change-Id: I343fd8d8b609a06bf6d4df23924e46752ea1052d