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

Change-Id: If505b2655e6dbdf863f227ad03838aca66ebd1f6