Merge "libcutils: canned_fs_config.c drop tabs"