Don't delete device specific prop folders from system

It is plenty big and this breaks extract-files

Change-Id: Idb12466e12d83356b1818274c1d6dd0a24b2c1d7
Merge "Don't delete device specific prop folders from system" into kk