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

Change-Id: Id656b715dc5975ded5ee5d7e18735fb01f6ce635