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

Change-Id: I365d06333de78629f36fb94adf035f70a299e291