Remove cm dependencies & add system.prop

Change-Id: Ie046f9ee466098bf9110d488bc2f0854128918f7