Remove cm dependencies & add system.prop

Change-Id: I5ded65d9409cf70d9b8d3f5a9156058f5ec04f06