Merge "Use libcutils_headers for android_filesystem_config.h" am: fe732cf630 am: 9ee4b1d429

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1430208

Change-Id: If116181292055f6ce235b179d5f57f55c28a0d47