Merge "libcutils: fs_config internal table alias test" am: 8fad110bfa
am: bfead93a3a

Change-Id: I6d3727fd22ce04559e437570d2a7b7a0ae35486a