Merge \\\\"libcutils: canned_fs_config.c drop tabs\\\\" am: 4ee9ed5366 am: ec129fe06c am: a8dbadd54e
am: 8e958c7aae

Change-Id: If6dd932d20dacde328844c7093e63d112914b93e