Remove cm dependencies & add system.prop

Change-Id: Ie7a952d3217c8a03d498cc5455576a29edceb650