Merge "Fix typo in error message in tools/fs_config/fs_config_generator.py." am: c5cb45b7da am: 77507f72fc am: 06e44ed303
am: 4f38a6a4e2

Change-Id: I090b4cfbc204423d94b7f12213cc8b470e3275fc