Merge "libcutils: convert fs_config.cpp" am: c50245e43e am: a255ab0cb0 am: 5f82055a2e
am: 5cad367060

Change-Id: If9640114e06ff1ad320d0a0fb88fdaef72a90281