Merge "libcutils: fs_config.c code compliance" am: b501400a76
am: 679942bf0d

Change-Id: I822cb6c50d1a47b76f4c249d59742f50452167a8