Merge "libcutils: convert fs_config.cpp" am: c50245e43e
am: a255ab0cb0

Change-Id: Ife5d12b9f4d3924b3903d91cd09e6592f4ee08b8