Merge "fs_config.c: make *.prop files 0600"
am: ebc39117ee

Change-Id: I8d8700564cad1dfc6e0140313f3f656986b8da27