Merge "libcutils: fs_config: remove aliases" into oc-dev-plus-aosp